Skip to content

data(catalog): rebuild the catalog database with the catalog-audit fixes (#670) — squash-merge only - #697

Merged
brickbots merged 12 commits into
mainfrom
fix/catalog-rebuild-7b
Nov 19, 2026
Merged

brickbots merged 12 commits into
mainfrom
fix/catalog-rebuild-7b

Conversation

@brickbots

@brickbots brickbots commented Nov 10, 2026 •

Copy link
Copy Markdown
Owner

Squash-merge only: the branch has three database commits, and only the final one must land.

This pull request replaces PiFinder's catalog database with a new build. The new database has the fixes from the catalog check in #670. Objects have better names, positions, types and magnitudes. A star that many catalogs list is now one object, with one position from Hipparcos. A new catalog, Named Stars, lists every star that has an official IAU name. This is the only database rebuild for PRs #671 to #696, because each committed version of the database is a download of about 24 MB for every PiFinder that updates.

The pull requests that this rebuild carries:

This pull request also adds one correction: NGC 771 is the star 50 Cassiopeiae (Corwin), so it joins Nam 9598 (Gang).

It also corrects how the import reads the Collinder catalog's names (see "Collinder names" below). The first database of this pull request had names such as "581 (M103)", "nl" and "4-5 Vul." on Collinder objects. The database was built again after that correction.

It also changes the rule that types a WDS star as a double star (see "WDS double-star rule" below). Now every pair that WDS lists makes a double star, unless WDS marks the pair as dubious. The database was built again after that change. It ships in release 2.6.4.

Fixes #670
Fixes #668
Fixes #667

Commits

  1. fix(catalog-corrections): NGC 771 same_as = "Nam 9598" in steinicke.toml. The source is Corwin's NGC notes: "NGC 771 = 50 Cassiopeiae is a star". The match guard accepts the join (both type *, 0.04′ apart), so it has no guard = false.
  2. data(catalog): the first rebuild of astro_data/pifinder_objects.db (sha256 03b6bcb3…). Commit 6 replaces it.
  3. test(catalog-data): tests/test_catalog_data.py and docs/ax/catalog.md §9.
  4. A merge of main (feat(migration): Pi OS side of the NixOS migration, with a btrfs root and kept settings #657, ci(release): the release workflow of the nixos branch, with migration_v2 keys #658, fix(display): run the 1.5" OLED at 20 MHz SPI #701). None of them changes the catalog: a build after the merge was still 03b6bcb3….
  5. fix(catalog-import): the Collinder loader reads its two name columns (collinder_names), with tests. One correction that the loader now makes unnecessary is deleted.
  6. data(catalog): the second rebuild of astro_data/pifinder_objects.db (sha256 c3cdb493…). Commit 11 replaces it.
  7. test(catalog-data): assertions for the Collinder names and joins.
  8. A merge of main (fix(sqm): measure the crop, and scale by the delivered analogue gain #666, the SQM fix). It changes no catalog file. A build after the merge, with a third hash seed, is still c3cdb493….
  9. docs(release-notes): release_notes/2.6.4-catalog.md, a one-page summary of the catalog changes for users. The 2.6.4 release notes link to it.
  10. fix(catalog-import): the WDS double-star rule (is_double_star_pair in wds_loader.py), with tests, and docs/ax/catalog.md §9.3 and the Catalog CONTEXT.md. Two obj_type corrections that the new rule contradicts are deleted (Vega and Fomalhaut).
  11. data(catalog): the final astro_data/pifinder_objects.db (sha256 474d0331…), in its own commit.
  12. test(catalog-data): assertions for the WDS double-star rule, and a release-note line.

The branch has three commits that change the database file (2, 6 and 11). A squash merge puts only the final file on main. A merge commit would put all three versions in the history, and every PiFinder would download all three.

Collinder names

The Collinder catalog comes from two files. collinder.txt has a column "NGC/Other Cat.", and collinder2.txt has a column "Other names". The loader added the text of each column as one name, without reading it. This is an error in the loader, so the loader is corrected (ADR 0046); no correction file is used.

collinder.txt, column "NGC/Other Cat." (471 rows):

the source writes rows the loader now gives before
nothing 60 no name the same
a number: "581" 294 "NGC 581", and the listing joins NGC 581 the same
"581 (M103)" 26 "NGC 581" and "M 103", and the listing joins that object one name "581 (M103)", no join
"6374 (6383)" 1 (Col 334) "NGC 6374" and "NGC 6383", and the listing joins that object one name, no join
"IC4725 (M25)" 1 (Col 382) "IC 4725" and "M 25", and the listing joins that object one name, no join
"Mel 15 (IC1805)" 1 (Col 26) "Melotte 15" and "IC 1805", and the listing joins IC 1805 one name, no join
"IC1848" 21 "IC 1848", with a space; the same join as before "IC1848"
"M45" 1 (Col 42) "M 45"; the same join as before "M45"
"Tr.9", "Mel.111", "Harv.5" 47 "Trumpler 9", "Melotte 111", "Harvard 5", one time not read; Col 256, Col 258 and Col 261 did not have "Melotte 111", "Harvard 5" and "Harvard 6"
"Tr 16" 1 (Col 234) "Trumpler 16" "Tr 16"
"Melotte 186", "Markarian 18" 2 (Col 359, Col 205) the name, one time the name, two times
"Mel 20 (PMC)", "Mel 25 (TMC)" 2 (Col 39, Col 50) "Melotte 20", "Melotte 25" "Mel 20 (PMC)"
"2384a", "2384b" 2 (Col 142, Col 143) the names "NGC 2384a" and "NGC 2384b"; no join, because a part of NGC 2384 is not NGC 2384 "2384a"
"(incorrectly) 3247" 1 (Col 220) nothing. Collinder 220 is not NGC 3247, so this text is never a name and never a join the name "(incorrectly) 3247"
"(Harvard 8)" 1 (Col 268) "Harvard 8" "(Harvard 8)"
"(Mel 72 per A/H)" 1 (Col 467) nothing: it is a note the name "(Mel 72 per A/H)"
"nl" (not listed) 2 (Col 62, Col 65) nothing the name "nl"
"4-5 Vul.", "9-12 Gem" 2 (Col 399, Col 89) nothing: these are the numbers of the cluster's stars, not a name the names "4-5 Vul." and "9-12 Gem"
"eta Car cluster (Tr 16)" 1 (Col 233) "eta Car cluster" and "Trumpler 16" one name
"Antares Cl." 1 (Col 302) "Antares Cluster" "Antares Cl."
"Orion Cluster", "Orion Belt", "Ursa Major" 3 (Col 69, Col 70, Col 285) the same name the same

Text in parentheses is kept only if it is one designation ("(M103)", "(Harvard 8)"). All other text in parentheses is a note ("(PMC)", "(Mel 72 per A/H)").

collinder2.txt, column "Other names" (471 rows):

the source writes rows the loader now gives before
nothing 379 no name the same
one name 82 the name the same
a list with commas 3 (Col 189, Col 229, Col 399) each name separately: Col 399 has "Al Sufi's Cluster", "Brocchi's Cluster" and "Coathanger" one name: "Al Sufi's Cluster, Brocchi's Cluster, Coathanger"
a footnote mark: "[note 1]" 7 nothing the same

29 Collinder listings now share the Messier, NGC or IC object that Collinder names. Before, each of them was a second sky object at almost the same position, because the import could not read "581 (M103)" as a designation. The join uses the same rule as all other catalogs (#671, #680): the designation must have a known catalog prefix, and the match guard must accept the position and the type. The match guard accepted all 29.

listing the source writes now shares the sky object of Collinder's position is away by
Col 14 581 (M103) NGC 581, M 103, Lyn 44 0.1′
Col 26 Mel 15 (IC1805) IC 1805, Sh2 190, Lyn 77 1.0′
Col 31 1039 (M34) NGC 1039, M 34, Lyn 87 1.0′
Col 67 1912 (M38) NGC 1912, M 38, Lyn 170 0.1′
Col 71 1960 (M36) NGC 1960, M 36, Lyn 180 0.0′
Col 75 2099 (M37) NGC 2099, M 37, Lyn 110 0.0′
Col 82 2168 (M35) NGC 2168, M 35, Lyn 196 1.0′
Col 118 2287 (M41) NGC 2287, M 41, Lyn 244 0.6′
Col 124 2323 (M50) NGC 2323, M 50, Lyn 269 1.6′
Col 152 2422 (M47) NGC 2422, NGC 2478, M 47, H 260, Lyn 339 0.2′
Col 159 2437 (M46) NGC 2437, M 46, Lyn 356 0.0′
Col 160 2447 (M93) NGC 2447, M 93, Lyn 359 0.3′
Col 179 2548 (M48) NGC 2548, M 48, H 151, Lyn 421 0.0′
Col 189 2632 (M44) NGC 2632, M 44, Lyn 449 0.4′
Col 204 2682 (M67) NGC 2682, M 67, Lyn 471 0.6′
Col 334 6374 (6383) NGC 6383, NGC 6374, Col 335, Lyn 730 0.0′
Col 341 6405 (M6) NGC 6405, M 6, Lyn 740 0.3′
Col 354 6475 (M7) NGC 6475, M 7, Lyn 760 0.2′
Col 356 6494 (M23) NGC 6494, M 23, Lyn 762 2.6′
Col 363 6531 (M21) NGC 6531, M 21, Lyn 774 0.6′
Col 375 6611 (M16) NGC 6611, M 16, Lyn 791 0.9′
Col 376 6613 (M18) NGC 6613, M 18, Lyn 792 0.1′
Col 382 IC4725 (M25) IC 4725, M 25, Lyn 803 8.1′
Col 389 6694 (M26) NGC 6694, M 26, Lyn 819 0.9′
Col 391 6705 (M11) NGC 6705, M 11, Lyn 826 0.2′
Col 422 6913 (M29) NGC 6913, M 29, Lyn 901 1.8′
Col 426 6994 (M73) NGC 6994, M 73, Lyn 921 0.1′
Col 438 7092 (M39) NGC 7092, M 39, Lyn 943 1.5′
Col 455 7654 (M52) NGC 7654, M 52, Lyn 981 0.5′

A build before the loader change and a build after it were compared, listing by listing:

WDS double-star rule

mrosseel, who observes double stars, reviewed the catalog changes. His principle: if WDS lists a pair, it is a double star. Whether you can see the companion is a different question. The filters answer it (a double star filters by its brighter star, #692), and so do the separation and the two magnitudes that each entry shows. Rich accepted this principle.

The rule before. A WDS listing was a double star (D*) only if one of its pairs agreed with all of these conditions:

  • the pair includes the primary star (A);
  • WDS gives a magnitude for the companion;
  • the separation is 0.5″ to 60″;
  • the companion is not more than 5 magnitudes fainter;
  • WDS does not mark the pair as optical (S, U, Y, L) or dubious (X).

All other WDS listings were single stars (*).

The rule now. A WDS listing is a double star if one or more of its pairs agrees with these two conditions:

  • WDS gives a magnitude for the companion;
  • WDS does not mark the pair as dubious (X).

Thus optical pairs are double stars. Pairs without the primary star (BC, CD) are double stars. There is no limit for the separation or for the magnitude difference.

old committed database old rule (c3cdb493…) new rule (474d0331…)
WDS listings that the WDS loader types D* 131,303 90,515 120,706
WDS listings that the WDS loader types * 0 40,788 10,597
WDS listings on a D* sky object 131,303 90,916 120,706
sky objects typed D* 134,158 91,444 121,232
sky objects typed * 742 41,463 11,675

The old committed database (release 2.6.3) typed every WDS listing D*, and it did not merge stars. Of the 10,597 WDS listings that are now *: in 9,726, WDS marks every pair as dubious. In 763, no pair has a companion magnitude. In 101, both are true. In 7, each pair is one or the other.

Against the old rule, only types change. A comparison of the two builds, listing by listing, finds no join changes, no name changes and no image changes. 30,049 listings change from * to D* and no listing changes from D* to *: WDS 29,790, Nam 178, SaR 35, Str 24, TLK 18 and SaM 4. The type has no effect on a match: the match guard accepts * and D* as the same kind, and the star identity step uses the type only to type the merged star. The star identity step merges the same 2,580 sky objects into the same 1,969 stars as before. The WDS loader's DM numbers, its descriptions and its magnitudes do not use the rule.

Examples that are now D*:

  • Atria (WDS 85313): its only pair, WFC 179, is 11.45 mag at 92″, and WDS marks it optical.
  • Suhail (WDS 50823): its only pair, SEE 109, is 12.6 magnitudes fainter (2.21 and 14.8, at 20.5″).
  • Canopus and Capella: WDS lists wide and faint companions, and for Capella also its 0.05″ pair. Hipparcos does not record them as double.
  • Vega (SaM 1241, Str 77, WDS 94640, Nam 91262): WDS marks its bright companions optical.
  • Fomalhaut (SaM 1633, Str 42, WDS 126404, Nam 113368): WDS lists SHY 106, the wide companion TW PsA at 7,060″.

Vega and Fomalhaut had corrections that typed them *, because SAC lists them but their companions are field stars. These corrections contradict the new rule, so they are deleted. The import now has 222 corrections.

Arcturus stays *: its only WDS pair, HDS 2003, is marked dubious. ζ Scl keeps its correction to *: its only WDS pair, B 631, is marked dubious, so the correction agrees with the new rule.

What a user sees: the double-star type filter shows more pairs than in the two earlier databases of this pull request. Each entry shows the separation and both magnitudes, so you can decide if you can split the pair.

Data effect

old (committed) new
sky objects 149,329 146,602
catalog listings 151,170 151,754
catalogs 21 22
name rows 430,288 430,269
objects typed D* 134,158 121,232
file size (bytes) 61,018,112 61,898,752
gzip -9 size (bytes) 22,910,955 24,468,235

Listings and sky objects per catalog:

catalog listings old → new sky objects old → new
Abl 79 → 79 79 → 79
Arp 337 → 337 337 → 337
B 343 → 343 343 → 343
C 109 → 109 109 → 109
Col 471 → 471 469 → 469
EGC 91 → 102 91 → 102
H 400 → 400 400 → 398
Har 147 → 147 147 → 147
IC 5,386 → 5,386 5,386 → 5,309
Lyn 1,151 → 1,151 1,150 → 1,149
M 110 → 110 110 → 110
NGC 7,840 → 7,840 7,840 → 7,579
Nam (new) — → 578 — → 578
RDS 110 → 110 110 → 110
SaA 114 → 114 114 → 114
SaM 2,162 → 2,157 2,160 → 1,904
SaR 333 → 333 333 → 332
Sh2 313 → 313 313 → 313
Str 78 → 78 78 → 78
TLK 93 → 93 93 → 93
Ta2 200 → 200 200 → 200
WDS 131,303 → 131,303 131,303 → 131,300

A lower count of sky objects in a catalog means that some of its listings now share a sky object with each other (NGC and IC duplicates, double-star rows of one system). The count of all sky objects is also lower by 29 than in the first database of this pull request (146,631), because of the 29 Collinder joins.

Stars merged. The star identity step merges 2,580 sky objects into 1,969 stars (70 of them by a cited hip correction). Before, only 1 sky object had listings in two or more star catalogs. Now 1,961 do. A star that no double-star list (SAC, RASC or WDS) lists as a double is typed *, not D* (#683; see "WDS double-star rule").

Names. There are 1,207 new name strings and 733 removed ones.

  • Removed: 65 changed only their case ("Crab nebula" is now "Crab Nebula"). 522 are other forms of an NGC or IC designation that the object already has: 475 without a space ("NGC6222", now "NGC 6222"; "IC1848" from Collinder, now "IC 1848") and 47 with zeros or letters from Arp ("NGC 0091"). 67 are Lyngå's "Collinder nnn", now "Col nnn". 45 are the Collinder texts that the tables above show ("581 (M103)", "nl", "4-5 Vul."). 34 are others: cited name fixes from fix(catalog-corrections): cited corrections for about 220 objects, and stricter correction checks #694 (for example "Laseth", "Al Rischa (Alrescha)", "Owl or E.T. Cluster"), the names of the 5 removed listings below, "Arp2" and "none".
  • Added: 58 changed only their case. 578 are the "Nam n" designators. 498 are names without digits: 471 IAU names, 20 Messier names, 2 SAC names and 5 Collinder names ("Al Sufi's Cluster", "Brocchi's Cluster", "Theta Carinae Cluster", "Antares Cluster", "eta Car cluster"). 73 are other designators (EGC 92 to 102, "M n", "Melotte 15", "Melotte 25", "NGC 2384a", "NGC 2384b").

Removed listings

Only 5 listings of the old database are not in the new one. All 5 are SAC Doubles rows that SAC marks as a rejected pair ("rej."). Since #683 the import skips these rows. Their sequence numbers stay taken, so every other SaM number names the same row as before. Each star is still in the database through its WDS listing:

removed SAC's row the star now
SaM 149 41 Ari, STT 47 rej. WDS 12734 + Nam 13209 (Bharani), 0.7′
SaM 729 STT 207 rej. WDS 110931, 0.3′
SaM 779 STF 1918 rej. WDS 77994, 0.2′
SaM 1585 σ Per, STT 56 rej. WDS 15405, 0.9′
SaM 2056 STF 1774 rej. WDS 71940, 1.2′

The new listings are EGC 92 to 102 and the 578 Nam listings. No other catalog code and sequence number was added or removed.

What a user sees for a removed listing: an observation of SaM 149 stays in the observation log and in its export, but no object shows as observed. An observing list entry "SaM 149" opens from its coordinates, if the list has them.

Listings that moved. 151,165 listings are in both databases. 1,508 of them are now more than 5′ from their old position:

An observation of such a listing now opens the corrected position.

Compatibility on a PiFinder that updates

The rebuild changes the sky object ids (objects.id). Nothing outside pifinder_objects.db stores one:

stored data what it stores
observation log (observations.db, obs_objects) catalog code and sequence (observations_db.py, the table's catalog and sequence columns). _resolve_object_ids finds each listing's sky object in the current database at startup, and keeps the result in memory only.
saved observing lists (obslists/) the designation, or the catalog code and sequence, and coordinates (obslist_formats.py). They are read back by designation, then name, then coordinates.
"Recent" list memory only (state.py). It is not saved.
catalog images file names from the catalog code and sequence (M82_POSS.jpg), then from names (cat_images.py).
catalog cache (cache/catalogs/composite_objects.pkl) it holds object ids, but its key is the database's path, modification time and size. The new file (61,898,752 bytes) has a different size from the old one and from the two earlier databases of this pull request (61,923,328 and 61,890,560 bytes), so the cache is built again in all cases.
config.json catalog codes only (the catalog filter).

The observation log stores the listing, and PiFinder shows "observed" for the sky object. So an observation of Col 14 now also shows M 103 and NGC 581 as observed, and an observation of M 103 shows Col 14 as observed. This is the same for the other 28 joined Collinder listings.

Reproducibility

The database was deleted first, then built with python -m PiFinder.catalog_imports.main. Two builds with PYTHONHASHSEED=1 and PYTHONHASHSEED=4242 are byte-identical:

sha256 474d0331a5bfacebb90b2f2cfd08c1e1db1ca24ac18efc92459aedecf35a52c7  astro_data/pifinder_objects.db

The import loads and applies all 222 corrections (70 of them hip). It reports no stale, redundant or conflicting correction. The build takes about 45 seconds. PRAGMA integrity_check is ok. The earlier databases of this pull request had sha256 03b6bcb3… and c3cdb493…; they are not the final file.

Findings

The catalog check's findings.py (paperChart, read-only) against each database:

findings
old committed database 1,374
Collinder database (c3cdb493…) 1,015
new database 1,131

Against the old committed database, 409 findings are gone and 166 are new. The first database of this pull request had 1,016 findings, the same as #694's final test build. The Collinder change removes one more: IC 2602 now has the name "Theta Carinae Cluster". It adds none.

The WDS rule changes only "double star" findings: 8 are gone and 124 are new. The check marks a D* star that Hipparcos does not record as double (no CCDM letter), and a * star that Hipparcos does record as double. The 124 new findings are D* stars whose WDS pairs Hipparcos does not record: optical, wide or faint companions (Canopus, Vega, Capella). By the new rule these are correct. The 8 gone are stars that Hipparcos records as double and that were * (Dschubba, Avior, Sargas, Ascella and 4 others). They are now D*. One remains: Arcturus, whose only WDS pair is marked dubious.

  • Gone, by category: kind 76, missing size 70, magnitude 46, size 42, star name 36, double star 19, far star name 25, position 24, star magnitude 22, missing magnitude 21, name 15, name only in the catalog 10, constellation 3.
  • New, by category: double star 138, star magnitude 10, magnitude 7, name only in the catalog 5, kind 3, size 2, position 1. Most of the double-star findings come from the WDS rule; the others are stars that now sit on a Hipparcos star, so the check can compare them for the first time. The others are cited values that the check's source does not agree with: Harris's globular magnitudes, C 37's 5.9, La Superba's variable range.

Tests

tests/test_catalog_data.py reads the committed database, so it changes with it:

  • counts: 22 catalogs, EGC 102, SaM 2,157, Nam 578. IC 1805 is C+N (Trumpler class "n", fix(catalog-import): type Steinicke rows by status, attach duplicates, mark not-found objects #676).

  • new assertions, with each value read from the new database: M 82's first name is "Cigar Galaxy" and it has no "Bode's Nebulae"; M 57's first name is "Ring Nebula"; NGC 56 has the not-found description and type ?; Mizar is one D* sky object with Str 56, SaM 2054, WDS 70779 and Nam 65378, magnitudes [2.23, 4.0] and filter magnitude 2.23; Vega has filter magnitude 0.03 and the Hipparcos position of HIP 91262; SaM 1019 has the Hipparcos position of HIP 44804; IC 2145 shares NGC 2086's sky object, NGC 771 shares Nam 9598's, and WDS 99456 shares Nam 94645's (Gumala); Nam 88567's first name is "Dhanuśarāgra".

  • Collinder assertions: Col 399 has "Al Sufi's Cluster", "Brocchi's Cluster" and "Coathanger" as three names, and no "4-5 Vul."; Col 14, Col 189, Col 382, Col 26 and Col 334 share the object that Collinder names; M 44's first name is "Beehive Cluster"; IC 1805 has type C+N; Col 220 is alone (it is not NGC 3247); Col 142 has the name "NGC 2384a" and is alone; no Collinder name is "nl", has parentheses, has a comma, or is only a number.

  • tests/test_catalog_matching.py has a test for each Collinder pattern of the tables above, and a test of the loader with the two files.

  • WDS rule assertions: Atria (an optical pair) and Suhail (a companion 12.6 magnitudes fainter) are D*; Arcturus (only a dubious pair) is *; Vega is D*; the WDS listings are 120,706 D* and 10,597 *.

  • tests/test_catalog_star_identity.py tests is_double_star_pair: an optical pair, a pair more than 5 magnitudes fainter, a pair closer than 0.5″, a pair wider than 60″ and a BC pair are double stars; a dubious (X) pair and a pair with no companion magnitude are not. tests/test_catalog_star_loaders.py tests the loader's types on WDS's own rows.

nox: lint, format, type_hints, smoke_tests (5) and unit_tests (2,363) pass.

Docs

docs/ax/catalog.md §9: the "Status (2026-11-08)" note is removed, because the committed database now matches the import that §9 describes. Its list of where the code is, and the link to ADR 0046, stay as a normal paragraph. §9.7 now gives the compressed size as about 24 MB. §9.3 has a new paragraph: how the Collinder loader reads its two name columns. §9.3 also gives the new WDS double-star rule, and the Catalog CONTEXT.md entry "Double star" agrees with it. release_notes/2.6.4-catalog.md has a line "Double stars follow WDS". It compares with release 2.6.3, where every WDS listing was D*.

Related issues

Screenshots

From the app, 128 px. The three WDS screenshots are from the final database. The others are from the Collinder database (c3cdb493…); the final database changes only star types, so they show the same:

Name search "miaplacidus": 1 result, Nam 45238 miaplacidus-search.png
Name search "mizar": 4 rows, the 4 listings of the one sky object mizar-search.png
Mizar's details: Double star, Mag 2.2/4.0, 14.4″ mizar-details.png
Named Stars list named-stars-list.png
SAC Doubles list in the names view sac-doubles-names.png
M 82's details: "Cigar Galaxy, NGC 3034, H IV 79, Arp 337" m82-details.png
Col 399's details: "Al Sufi's Cluster, Brocchi's Cluster, Coathanger, Ta2 173, Lyn 847" (the line scrolls), and no "4-5 Vul." col399-details.png, col399-details-2.png
M 103's details: "NGC 581, Col 14, Lyn 44" m103-details.png
Name search "coathanger": 5 results, Col 399 first coathanger-search.png
WDS Doubles list with the type filter set to Double star only wds-doubles-filter.png
The same list at WDS 50823 (Suhail), which was * before and so not in this list wds-doubles-suhail-in-list.png
Suhail's details: Double star, Mag 2.2/14.8, 20.5″, and the WDS line "Mag=2.21/14.8, PA=142.8 (2000), Sep=20.52" suhail-details.png

On-device checklist (Rich, before merge)

Done on hardware (rev4) by Rich on 2026-11-19, with the final database (sha256 474d0331…): every item passes. The first start reached the main menu in 13 s; the catalog finished loading in the background after about 1 min 55 s (the cache rebuild).

Update a PiFinder to this branch. Let the first start build the catalog cache again. Then:

  • M 82's details show "Cigar Galaxy" first, and no "Bode's Nebulae".
  • M 57's details show "Ring Nebula" first.
  • NGC 56's details start "Not found: nothing at Dreyer's position (Steinicke)."
  • Mizar (SaM 2054, Str 56, WDS 70779 or Nam 65378) is one Double star, Mag 2.2/4.0, and each of the 4 listings goes to the same position.
  • Magnitude filter: set a magnitude limit of 6 (the lowest the menu offers) and open SAC Doubles. SaM 549 (Procyon, 0.4/12.9) and SaM 1633 (Fomalhaut, 1.2/14.0) stay in the list. The old database filtered them by the mean of their two stars (6.65 and 7.6) and hid them.
  • Double-star type filter: set Type to Double star only and open WDS Doubles. WDS 50823 (Suhail) is in the list. Its details show Double star, Mag 2.2/14.8 and 20.5″. Vega (Nam 91262) is a Double star, and Arcturus (Nam 69673) is a Star.
  • Nam 88567 shows "Dhanuśarāgra" with the ś and the ā drawn correctly.
  • A name search for an IAU name that only Named Stars has, for example "Miaplacidus", finds it.
  • Objects > By Catalog > Stars… > Named Stars opens the list.
  • A names-view list (SAC Doubles or Named Stars) shows names first.
  • An observing list that names Collinder 399 opens it (Col 399, the Coathanger, with Ta2 173 and Lyn 847).
  • Col 399 shows Al Sufi's Cluster, Brocchi's Cluster and Coathanger as separate names, and no '4-5 Vul.'.
  • M 103's details show "NGC 581, Col 14, Lyn 44", and Col 14 opens the same object (Open Cluster, Mag 7.4).
  • A name search for "Mizar" shows only the 4 listings of one sky object (no second Mizar).
  • An observation logged before the update still shows as observed (for example an M or NGC object).

🤖 Generated with Claude Code

brickbots and others added 8 commits November 9, 2026 22:19
Corwin's NGC notes: "NGC 771 = 50 Cassiopeiae is a star" (an A1 V star,
no nebulosity on the POSS1). 50 Cas is HIP 9598, IAU name Gang, which
#695 lists as Nam 9598. The listing joins that star; the match guard
accepts the join (both type *, 0.04' apart).

Refs #670

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The one rebuild for the catalog-audit campaign. It carries the import,
loader, star-identity and correction changes of #671 to #696, and the
NGC 771 correction before it. Built from a fresh file with
`python -m PiFinder.catalog_imports.main`; two builds with different
PYTHONHASHSEED values are byte-identical:

sha256 03b6bcb3288b1a2909e4fedb49559f46517c7bf4e3f13ad097f848f2c5ad670e

All 225 corrections apply (70 of them hip identifications).

Refs #670

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…in fixes

test_catalog_data.py reads the committed database, so its assertions
land with the rebuild: 22 catalogs, EGC 102, SaM 2157 (rejected pairs
skipped), Nam 578, and IC 1805 typed C+N (Trumpler "n", #676).

New assertions, each read from the rebuilt file: the M 82 and M 57
preferred names; a not-found NGC object's description; Mizar as one D*
sky object with its Str, SaM, WDS and Nam listings and the double-star
filter magnitude; Vega's V 0.03 and Hipparcos position; SaM 1019 on
HIP 44804; IC 2145 joined to NGC 2086, NGC 771 to Nam 9598, and Gumala
one object (WDS 99456 + Nam 94645); Dhanuśarāgra with its diacritics.

docs/ax/catalog.md §9: the status note goes, since the committed
database now matches the import §9 describes. Its code map and the
ADR 0046 link stay, as a plain paragraph. The compressed size is
about 24 MB.

Refs #670

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
… text

load_collinder added the raw text of collinder.txt's "NGC/Other Cat." column
and of collinder2.txt's "Other names" column as names. "581 (M103)" stayed a
plain name, so Col 14 was a second sky object 0.1' from M 103, and Col 399
carried "4-5 Vul." and the one name "Al Sufi's Cluster, Brocchi's Cluster,
Coathanger".

The loader now reads both columns (collinder_names):

- a designation is written out: "581 (M103)" is "NGC 581" and "M 103",
  "IC1848" is "IC 1848", "Tr.9" is "Trumpler 9". 29 Collinder listings now
  join the Messier, NGC or IC object that Collinder names (26 Messier
  clusters, Col 334 = NGC 6374, Col 382 = IC 4725, Col 26 = IC 1805);
- "(incorrectly) 3247" gives no name, so Col 220 can never join NGC 3247;
- "nl", the star numbers "4-5 Vul." and "9-12 Gem", and notes in
  parentheses ("(PMC)", "(Mel 72 per A/H)") are no names;
- "2384a" is the name "NGC 2384a", which joins nothing;
- a comma list is separate names, and a name is listed once.

The IC 2602 correction removed "Theta Carinae Cluster, Southern Pleiades".
The loader now splits that list, so the correction is deleted.

Refs #670

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
A fresh-file build of this branch (the database was deleted first), after the
Collinder loader fix. Two builds with PYTHONHASHSEED=1 and 4242 are
byte-identical:

sha256 c3cdb493338f57a4c01d8d69b4170039b8dffedf991b4b93ce73ed961dad861d

The import loads and applies all 224 corrections.

Against the first rebuild of this branch (ead7120, sha256 03b6bcb3...):
146,631 -> 146,602 sky objects, because 29 Collinder listings now share the
Messier, NGC or IC object that Collinder names. The 151,754 catalog listings
are the same. No other join changed.

This replaces ead7120's database. Squash-merge the pull request, so that
only this version of the file lands on main.

Refs #670

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
…base

Col 399 has "Al Sufi's Cluster", "Brocchi's Cluster" and "Coathanger" as
three names, and no "4-5 Vul.". Col 14, 189, 382, 26 and 334 share the
Messier, NGC or IC object that Collinder names; M 44 keeps "Beehive Cluster"
first, and IC 1805 keeps its type C+N. Col 220 is not NGC 3247, and Col 142
("NGC 2384a") is not NGC 2384. No Collinder name holds raw column text.

Refs #670

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@brickbots brickbots changed the title data(catalog): rebuild the catalog database with the catalog-audit fixes (#670) data(catalog): rebuild the catalog database with the catalog-audit fixes (#670) — squash-merge only Nov 16, 2026
brickbots added a commit that referenced this pull request Nov 16, 2026
…nd the release-branch plan

The playbook was written on 2026-09-05. Since then #657 and #658 landed, and
parts of it became wrong.

One command was wrong from the start. The conflict check piped
`git merge-tree` into `grep -c '<<<<<<<'`. The two-argument form prints a
tree id and a file list, never conflict markers, so the count is always 0.
It is 0 on the 2.6.3 cut, which had a version.txt conflict. The check now
uses `--write-tree` and the exit code, and compares the result with main's
tree.

The NixOS section repeated mechanics that belong to nixos/RELEASE.md on the
nixos branch, and four statements no longer matched the code: the gate flag
(now nixos_migration), the cache host, the reason for the tarball size
limit, and who creates the tag. The section is now a pointer.

Two checks could not pass: ".github byte-identical" (the difference is part
of the cut) and "ADR ledger has no gaps" (0036 to 0045 are on the NixOS
line). The first now names the real hazard: release is the default branch,
and its old release.yml writes the manifest key that 2.6.3 reads.

New sections:

- Between cuts: the rule for promoting docs from main to release, and the
  fact that a promotion also carries code (#639 and #640 reached release
  after the v2.6.3 tag with no version bump).
- Where the tracks meet: 2.6.4 is the first Pi OS release that can migrate
  to NixOS. The contract that freezes at the cut, the 7x SQUARE path that
  ignores the gate, the 90-day life of a beta, and opening the gate as a
  release of its own.
- Decided for 2.6.4: #697 ships in it, and no stable NixOS release comes
  first.
- A transition plan for the release branch: it stays the Pi OS line for
  ever, the default branch moves to main after the 2.6.4 cut, the cut from
  main ends when #379 merges, and /en/release/ redirects to /en/stable/ at
  the first stable 3.x.

Docs snapshots: /en/v2.6.3/ exists, so the text no longer says nothing
exists for 2.6. The "previous versions" notes were not updated for it; that
step now belongs to the prep PR of the next release.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
brickbots added a commit that referenced this pull request Nov 19, 2026
…SE.md (#644)

release_notes/RELEASE-PLAYBOOK.md is the process behind a release, pulled out of
the 2.6.1, 2.6.2 and 2.6.3 plans so the next cut starts from it.

- Phases 1 to 8 for a 2.x release, with the traps that bit earlier cuts.
- The rule for promoting documentation fixes from main to release between cuts.
- A pointer to the NixOS release process (nixos/RELEASE.md on the nixos
  branch), not a copy of it.
- The migration, where the two lines meet: 2.6.4 is the first Pi OS release
  that can migrate to NixOS. What freezes at that cut, and the checks before
  the migration gate opens.
- Decided for 2.6.4: #697 ships in it, and no stable NixOS release comes first.
- A proposed transition plan for the release branch: it stays the Pi OS line,
  the default branch moves to main after the 2.6.4 cut, the cut from main ends
  when #379 merges, and /en/release/ redirects to /en/stable/ at the first
  stable 3.x.

RELEASE.md at the repo root was a byte-identical copy of release_notes/2.6.1.md
with nothing referencing it. Removed.

Phase 6 (the 2.x SD image) and the announcement channels in phase 7 are still
stubs.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
brickbots and others added 4 commits November 18, 2026 18:38
…lease notes link to

Refs #670

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
… it dubious

The D* rule's WDS clause now types a WDS listing D* if any of its pairs
has a companion magnitude and is not noted X (dubious). Optical pairs
(S, U, Y, L), pairs without the primary (BC), and pairs of any
separation or magnitude difference count. The type says what the
object is; visibility is for the filters (a double filters by its
brighter star) and for the separation and magnitudes the entry shows.
This follows mrosseel's review of #697. The old limits (0.5-60",
5 mag, primary only, no optical flags) typed 40,788 of 131,303 WDS
listings single; the new rule types 10,597 single.

The Vega (SaM 1241) and Fomalhaut (SaM 1633) obj_type corrections are
deleted: they undid the old rule for optical/wide companions, and both
stars are now D* by WDS, as SAC lists them. zeta Scl's (SaM 1745, only
pair X-flagged) agrees with the new rule and stays. 222 corrections.

The type still affects no match: the match guard treats * and D* alike
(is_star_type), and the star identity reads the type only to type the
merged star.

Refs #670

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Every WDS pair is a double star unless WDS marks it dubious (X) or gives
no companion magnitude. Objects typed D*: 91,444 -> 121,232; WDS
listings D*: 90,916 -> 120,706. Only types change against the previous
build (c3cdb493...): 30,049 listings go from * to D*, no join, value,
name or image changes. 222 corrections apply clean.

Two fresh builds (PYTHONHASHSEED=1 and 4242) are byte-identical:
sha256 474d0331a5bfacebb90b2f2cfd08c1e1db1ca24ac18efc92459aedecf35a52c7

Refs #670

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…tabase

Atria (optical pair WFC 179) and Suhail (SEE 109, 12.6 mag fainter) are
D*; Arcturus (only pair HDS 2003, flagged X) is *; Vega is D*. WDS
listings by type: 120,706 D*, 10,597 *. The 2.6.4 catalog release note
gets a "Double stars follow WDS" bullet.

Refs #670

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant